projects / gtk4.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 0ca6367)
gtk/gtkcheckbutton.c gtk/gtkdnd.c gtk/gtkentry.c gtk/gtkmenu.c
authorMichael Natterer <mitch@imendio.com>
Thu, 18 Jan 2007 17:30:10 +0000 (17:30 +0000)
committerMichael Natterer <mitch@src.gnome.org>
Thu, 18 Jan 2007 17:30:10 +0000 (17:30 +0000)
2007-01-18  Michael Natterer  <mitch@imendio.com>

* gtk/gtkcheckbutton.c
* gtk/gtkdnd.c
* gtk/gtkentry.c
* gtk/gtkmenu.c
* gtk/gtktreeview.c
* gtk/gtkviewport.c: pass more clip rectangles to gtk_paint_foo()
functions. Based on a patch from maemo-gtk (bug #398023).

svn path=/trunk/; revision=17183

ChangeLog patch | blob | history
gtk/gtkcheckbutton.c patch | blob | history
gtk/gtkdnd.c patch | blob | history
gtk/gtkentry.c patch | blob | history
gtk/gtkmenu.c patch | blob | history
gtk/gtktreeview.c patch | blob | history
gtk/gtkviewport.c patch | blob | history

diff --git a/ChangeLog b/ChangeLog
index ddff5e88844c72921df8edf7db256f7db9c580ac..09783fb84e51445e99e37cb9d1945e1846d09b6d 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,13 @@
+2007-01-18  Michael Natterer  <mitch@imendio.com>
+
+       * gtk/gtkcheckbutton.c
+       * gtk/gtkdnd.c
+       * gtk/gtkentry.c
+       * gtk/gtkmenu.c
+       * gtk/gtktreeview.c
+       * gtk/gtkviewport.c: pass more clip rectangles to gtk_paint_foo()
+       functions. Based on a patch from maemo-gtk (bug #398023).
+
 2007-01-17  Tor Lillqvist  <tml@novell.com>
 
        * gtk-zip.sh.in: Include also the COPYING file.
diff --git a/gtk/gtkcheckbutton.c b/gtk/gtkcheckbutton.c
index 6899a504408c54e801d58ea77966704f71379440..46146983e8ab2e214d13603870f302d13e087bac 100644 (file)
--- a/gtk/gtkcheckbutton.c
+++ b/gtk/gtkcheckbutton.c
@@ -155,14 +155,14 @@ gtk_check_button_paint (GtkWidget    *widget,
          
          if (interior_focus && child && GTK_WIDGET_VISIBLE (child))
            gtk_paint_focus (widget->style, widget->window, GTK_WIDGET_STATE (widget),
-                            NULL, widget, "checkbutton",
+                            area, widget, "checkbutton",
                             child->allocation.x - focus_width - focus_pad,
                             child->allocation.y - focus_width - focus_pad,
                             child->allocation.width + 2 * (focus_width + focus_pad),
                             child->allocation.height + 2 * (focus_width + focus_pad));
          else
            gtk_paint_focus (widget->style, widget->window, GTK_WIDGET_STATE (widget), 
-                            NULL, widget, "checkbutton",
+                            area, widget, "checkbutton",
                             border_width + widget->allocation.x,
                             border_width + widget->allocation.y,
                             widget->allocation.width - 2 * border_width,
diff --git a/gtk/gtkdnd.c b/gtk/gtkdnd.c
index a30da5e5e17c8d326cb13fb609f609334ef8d854..e227b69477d2f5b9c9f11e7fa7994c18c9d35d03 100644 (file)
--- a/gtk/gtkdnd.c
+++ b/gtk/gtkdnd.c
@@ -982,7 +982,7 @@ gtk_drag_highlight_expose (GtkWidget      *widget,
       
       gtk_paint_shadow (widget->style, widget->window,
                        GTK_STATE_NORMAL, GTK_SHADOW_OUT,
-                       NULL, widget, "dnd",
+                       &event->area, widget, "dnd",
                        x, y, width, height);
 
       cr = gdk_cairo_create (widget->window);
diff --git a/gtk/gtkentry.c b/gtk/gtkentry.c
index ae2ab81f15f72cb4852c8ce9d51081a6a0de7673..35445f8fcb9e04f8e6773d372d156f261595b9d7 100644 (file)
--- a/gtk/gtkentry.c
+++ b/gtk/gtkentry.c
@@ -159,7 +159,8 @@ static void   gtk_entry_size_request         (GtkWidget        *widget,
                                              GtkRequisition   *requisition);
 static void   gtk_entry_size_allocate        (GtkWidget        *widget,
                                              GtkAllocation    *allocation);
-static void   gtk_entry_draw_frame           (GtkWidget        *widget);
+static void   gtk_entry_draw_frame           (GtkWidget        *widget,
+                                              GdkRectangle     *area);
 static gint   gtk_entry_expose               (GtkWidget        *widget,
                                              GdkEventExpose   *event);
 static gint   gtk_entry_button_press         (GtkWidget        *widget,
@@ -1505,7 +1506,8 @@ gtk_entry_size_allocate (GtkWidget     *widget,
 }
 
 static void
-gtk_entry_draw_frame (GtkWidget *widget)
+gtk_entry_draw_frame (GtkWidget    *widget,
+                      GdkRectangle *area)
 {
   gint x = 0, y = 0;
   gint width, height;
@@ -1529,7 +1531,7 @@ gtk_entry_draw_frame (GtkWidget *widget)
 
   gtk_paint_shadow (widget->style, widget->window,
                    GTK_STATE_NORMAL, GTK_SHADOW_IN,
-                   NULL, widget, "entry",
+                   area, widget, "entry",
                    x, y, width, height);
 
   if (GTK_WIDGET_HAS_FOCUS (widget) && !interior_focus)
@@ -1540,7 +1542,7 @@ gtk_entry_draw_frame (GtkWidget *widget)
       height += 2 * focus_width;
       
       gtk_paint_focus (widget->style, widget->window, GTK_WIDGET_STATE (widget), 
-                      NULL, widget, "entry",
+                      area, widget, "entry",
                       0, 0, width, height);
     }
 }
@@ -1552,7 +1554,7 @@ gtk_entry_expose (GtkWidget      *widget,
   GtkEntry *entry = GTK_ENTRY (widget);
 
   if (widget->window == event->window)
-    gtk_entry_draw_frame (widget);
+    gtk_entry_draw_frame (widget, &event->area);
   else if (entry->text_area == event->window)
     {
       gint area_width, area_height;
@@ -1561,7 +1563,7 @@ gtk_entry_expose (GtkWidget      *widget,
 
       gtk_paint_flat_box (widget->style, entry->text_area, 
                          GTK_WIDGET_STATE(widget), GTK_SHADOW_NONE,
-                         NULL, widget, "entry_bg", 
+                         &event->area, widget, "entry_bg",
                          0, 0, area_width, area_height);
       
       if ((entry->visible || entry->invisible_char != 0) &&
diff --git a/gtk/gtkmenu.c b/gtk/gtkmenu.c
index 291f31a9ae2f6671dc19494c438997a8057d26a2..94344383d0841656a1409632bc01431ef7414319 100644 (file)
--- a/gtk/gtkmenu.c
+++ b/gtk/gtkmenu.c
@@ -2458,7 +2458,7 @@ gtk_menu_paint (GtkWidget      *widget,
                     widget->window,
                     GTK_STATE_NORMAL,
                     GTK_SHADOW_OUT,
-                    NULL, widget, "menu",
+                    &event->area, widget, "menu",
                     0, 0, -1, -1);
 
       if (menu->upper_arrow_visible && !menu->tearoff_active)
@@ -2477,7 +2477,7 @@ gtk_menu_paint (GtkWidget      *widget,
                           widget->window,
                           priv->upper_arrow_state,
                           GTK_SHADOW_OUT,
-                          NULL, widget, "menu_scroll_arrow_up",
+                          &event->area, widget, "menu_scroll_arrow_up",
                           GTK_ARROW_UP,
                           TRUE,
                           (width - arrow_size ) / 2,
@@ -2501,7 +2501,7 @@ gtk_menu_paint (GtkWidget      *widget,
                           widget->window,
                           priv->lower_arrow_state,
                           GTK_SHADOW_OUT,
-                          NULL, widget, "menu_scroll_arrow_down",
+                          &event->area, widget, "menu_scroll_arrow_down",
                           GTK_ARROW_DOWN,
                           TRUE,
                           (width - arrow_size) / 2,
diff --git a/gtk/gtktreeview.c b/gtk/gtktreeview.c
index 3a3cc8a927e2fda28446841834ade34fa7ede012..7afb4a75f930a4b379d79b002ca81482947a4a2f 100644 (file)
--- a/gtk/gtktreeview.c
+++ b/gtk/gtktreeview.c
@@ -4628,7 +4628,7 @@ gtk_tree_view_bin_expose (GtkWidget      *widget,
                gtk_paint_focus (widget->style,
                                 tree_view->priv->bin_window,
                                 GTK_WIDGET_STATE (widget),
-                                NULL,
+                                &event->area,
                                 widget,
                                 (is_first
                                  ? (is_last ? "treeview-drop-indicator" : "treeview-drop-indicator-left" )
@@ -4641,7 +4641,7 @@ gtk_tree_view_bin_expose (GtkWidget      *widget,
                gtk_paint_focus (widget->style,
                                 tree_view->priv->bin_window,
                                 GTK_WIDGET_STATE (widget),
-                                NULL,
+                                &event->area,
                                 widget,
                                 "treeview-drop-indicator",
                                 0, BACKGROUND_FIRST_PIXEL (tree_view, tree, node)
@@ -4695,7 +4695,7 @@ gtk_tree_view_bin_expose (GtkWidget      *widget,
            gtk_paint_focus (widget->style,
                             tree_view->priv->bin_window,
                             focus_rect_state,
-                            NULL,
+                            &event->area,
                             widget,
                             (is_first
                              ? (is_last ? "treeview" : "treeview-left" )
@@ -4706,7 +4706,7 @@ gtk_tree_view_bin_expose (GtkWidget      *widget,
            gtk_paint_focus (widget->style,
                             tree_view->priv->bin_window,
                             focus_rect_state,
-                            NULL,
+                            &event->area,
                             widget,
                             "treeview",
                             0, tmp_y,
diff --git a/gtk/gtkviewport.c b/gtk/gtkviewport.c
index eb123094c9649fcad9c073539869ecd930dbf7dd..114415b088a5135dd5aa4174c9d731ad9d80715c 100644 (file)
--- a/gtk/gtkviewport.c
+++ b/gtk/gtkviewport.c
@@ -656,7 +656,7 @@ gtk_viewport_paint (GtkWidget    *widget,
 
       gtk_paint_shadow (widget->style, widget->window,
                        GTK_STATE_NORMAL, viewport->shadow_type,
-                       NULL, widget, "viewport",
+                       area, widget, "viewport",
                        0, 0, -1, -1);
     }
 }
Unnamed repository; edit this file 'description' to name the repository.